Fix mutex panic in BatchWithFlusher when Write() returns error#1136
Open
snissn wants to merge 1 commit intocosmos:masterfrom
Open
Fix mutex panic in BatchWithFlusher when Write() returns error#1136snissn wants to merge 1 commit intocosmos:masterfrom
snissn wants to merge 1 commit intocosmos:masterfrom
Conversation
BatchWithFlusher.Set and Delete could panic with "sync: unlock of unlocked mutex" when the flush path was taken and Write() returned an error. Both methods used defer b.mtx.Unlock() while also manually unlocking the mutex before calling Write(). On a Write() error, the function returned while the mutex was already unlocked, causing the deferred Unlock() to panic. Rework the flush path to always re-acquire the mutex before returning, ensuring lock/unlock invariants are preserved and Write() errors propagate normally instead of crashing the process.
Author
|
issue #1135 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes a lock/unlock mismatch in
BatchWithFlusher.SetandDeletethat can cause a runtime panic whenWrite()returns an error on the flush path.Both methods use
defer b.mtx.Unlock()while also manually unlocking the mutex prior to callingWrite(). IfWrite()fails, the function returns while the mutex is already unlocked, and the deferredUnlock()triggers:Changes
Unlock().Impact
BatchWithFlushersafe whenWrite()can legitimately fail (e.g., alternative backends, injected faults, or stricter error handling).Notes
This change intentionally does not alter higher-level error handling semantics for failed writes; it only ensures mutex correctness and stability.
If you want, I can also: